merge emacs-23
authorKenichi Handa <handa@m17n.org>
Wed, 13 Oct 2010 13:40:51 +0000 (22:40 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 13 Oct 2010 13:40:51 +0000 (22:40 +0900)

Trivial merge